minor fixes before live