Minor fixes for rack scanning