REFS #255 few fixes