Cleanup a few more picky warnings