More goon pounce fixes