Fixes

Fixes for #88 and #89.