Re #10: Attempting to fix Mac/Linux build errors.