BZ1120897 fixes