Small fixes before launch