Updates for 1.9