Fixing a couple of things that were annoying me