Pushing changes for new manifest approach that should solve the strange behavior on OSX.