Fixes for #8