Syntax fixes and rAF support