Plugin fixes