minor updates to improve interoperation with other plugins