Hot-fixes to enable backup server