Make a few final changes prior to merging.