Bunny and H fixes