Plugin fixes and updates