Beginning to fix compilation errors