fixes for non-debug build