Fixes to work with IRRemote