fixes related CARBON-14883 and CARBON-14744