fixes after first production test run