Lints and small fixes
Release v2.1.10