Made several plugin changes