Fix various loaders