Fixes for #2102