Fixes for #263