BUG Fixes to sync_controller_images