Various tweaks as a result of Browser testing.