Rebuild with fixes