Fixes for #74