misc small changes

Maxym, please check and pull at your convenience...