Fixes for testing and site shutdown