Small fixes and remove background status check