Updates for 1.14