BUG: Fixed plugin bugs etc.