Issue #95 few fixes