Fixes for #1

Fixes for issue #1.