client-plugin fixes