Fixes for #5356