Fixes and Html5 loading