Fix a couple small things