Lint fixes
Don't include dependency's support v4