Fixes and ES5 notes