Fixing some minor bugs for things that weren't working quite the way they should