Fix warnings

Apparently I didn't fix all of them in the previous commit. This
should shore them up.