Fixes for #68