Fixes tests and errors
Release v2.0.17