Fix two background image related bugs