WIP: Fix compilation errors.