Fixes for build 250 and more