Windows compatibility and removed warnings.