Fix Lint Issues