Fix some code standard issues.