Some clean up and manifest actualization.