Bug fixes for loaders