Fixes for Lint