Fixing things some more