Fixes for #21