A few fixes for 1.6.1.