Fix compilation errors on beauregard.