1.6.1 and other changes