Fixed more compile errors.