Fix compilation errors. Some API changes where missed.