Correcting more compilation errors.