small fixes for preproduction