Bring in fixes for #17