Final fixes for 2.1.7