GM2 incoming!
Fixes as reported by @ccd0.