Fix according to Lint Report