End without coordinated homing and other tweaks