Small tweaks addressing issue #26