fixes for release build