fixed issues with canvas etc