Fixes #75 and #74.