Little fixes before the big drop