Fixes on Loaders