First attempt to fix windows compile errors.