Some changes prior to forcing actual loads