Manifest file fixes