Fixed some coding standard issues reported by fabbot