Misc cleanup changes.