Fixes to get context available to cde via interplugin call