plugin fixes