Fixes for the background agents