Added multiple plugin manifest check, other small fixes