Further fixes to make things work in Chrome again
Merge pull request #1319 from Pomax/chrometeration2

Further fixes to make things work in Chrome again