Just one more fix...

I know, more micro commits, but I keep finding places I messed up.