Fixes for #12