Some fixes for right click activation of remote and block activate