Minor changes on mandatory-load stuff