BUGR-11213 fixes