Es5 syntax only; additional fixes