miscellaneous changes

review @den_sh /cc @VladUreche