Fixing things I think