Change plugin id back and correct powershell bugs