v 2.1.7.1

Various Fixes