Fixes for #90