Fix oclint violations.