Fixed Lint errors and warnings.