Fix some docking clearance bugs