CMF-42: Fixed bugs