Fixing some, breaking others.