Fixes for #26