Fixes for background and oncore