Some improvements to remote-control integration