Squashed some minor bugs