Fix(es) for ES5