Issue #195 Minor fixes