Additional fixes related to [ALLI-2071]