Cleaned up manifests, fixed building issue for Free.