merge last fixes

one more time - trying to avoid mess I've made first time