More remote control bug fixes