Fixes for #1605