Fixes for build 250