Fixing dso problem with separate context/command_queue variables