Cleaned up some manifest issues.