#noref small fixes for production