Misc final changes.