Attempting to fix compile errors.