Fixes more bugs with the Manifest import