Esc related tweaks