Remove a few style warnings