Cleanup and fix recent commits.