Pull in various fixes