Many minor plugin fixes