Fix coding style issues @stof discovered