Fix compiler errors triggered by upstream changes