Fixes for #437