Pull in fixes for #6