Hopefully fix some background task issues