Fixing things before presentation