Final fixes for 2.1