Further fixes to make things work in Chrome again