Some changes for powershell