Minor fixes before promotion