Fixes for #426