Fixes for backup