Fixing a couple small bugs