Fix style warnings