Small plugin fixes