Fixes to ManifestLoader