Fixes for #293