Changes for 1.8.1 build.