Fix a bunch of errors in tagged version.