UPD: fix previous commit, small fixes