Re-committing manifests, fixed target platform definition