Pull in bugfixes