Remove remaining warnings

A couple of these were actual bugs.