Fixes to fix deployments utilising existing DB imports.