Squashed minor bugs