Fixed homing bugs