More bug fixes.

I'd made a bunch of minor oversights (some pertaining to Gen VI type
changes), fixed them. Thanks, /vp/!