Fixes for #224