Updated plugin fixes