Minor fixes for newer chrome versions