Updated options for Universal build.