Some changes for non windows...