Fix coding style warnings