Plugin fixes;