Silence some more warnings

This is not ready for merge yet. But I would like to get a travis test running