REFS: #407 minor fixes