Loaders fixes and repackaging