Fixes for background scanner, seems fairly stable? Need to check loading