Docking controller fixes