Fixes for issues #165 and #166