Fixing loader, minor stuff