update to latest and fix build errors with changed headers