Bug fixes

Just a few bugs that needed to be squashed. :mans_shoe: + :bug: = :smiley: