Squashed some logic bugs