Fixed up loader issues