Squashing minor bugs