Updates for 2.1.8