Pull in latest and fix build