Fixes for #7