Fixes, closes issue #8.