Small fixes
Release 3.1.0