Corrected some gcc compile errors.