I've started fixing some of this remaining issues after porting to html5.