Corrected some compilation issues