Updates for 1.13