hot fixes before launch