Fixing more variable scoping issues
Fixing "Include" and "Remove" context menu commands