Fix up Manifest