Fixes for 30|30
backup