2 bugs squashed