Fix some code style warnings