Warning fixes

Mostly minor ones, but one that looks sorta dangerous (83373b8.)

-[Unknown]