Fixing things up