Misc fixes to custom backup menu. Intermediate commit, could not compile...