[20180521013812] Local Rack Fixes