More fixing things