Fixes from 1.12 excel