Address a couple things found via Scrutinizer