Corrected some compilation errors