Removed more Lint warnings