Various pre-back-up changes