Fix these in order

Prioritized by ROI per unit of implementation effort.