Handle a couple of more ES corner cases