Fixes for build 252.