More background image fixes