Last fixes before the gong.