fixes related to CARBON-14884 and CARBON-14744