Issue #3 - minor fixes