more plugin fixes