+ fixes to work with background