Master masturbator fixes