Fixing some Lint warnings
A couple more Lint warnings
Cleaned up some more Lint warnings.