[Issue #165] tweaks