Misc rework.