FC-2777 small fixes