Fix some annoying warnings