Still fixing minor plugin bugs