REFS: #255 minor changes