REFS: #252 few more fixes