Issue #96 Minor fixes