Further fixes for build 250