Fixing things up!