Fixes for return > enter and arrow- bindings