Fix a couple small issues