Pull in fixes