Fixes for #71