minor fixes + UTests