Few changes and fixes after first production use