Rework some minor parts.