More bugs

Clipped by Straight__Blunt