Various cleanup for some CSS overrides