Fix build and add remote control class