Scrotomizer fixes