fixes more stuff

Thanks Rivet, double-checked the other files and found one more issue
that's been corrected. Hopefully this'll be the last fix.