Several compilation error correction.