[trunk] Fixing compilation from recent changes