Fixes for #20