Fix plugin response parsing

- + Fix minor issues