Fix minor issues (that failed in UnitTests)