some fixes for first production