Fix initial compilation errors