Fixing up scoop_poc and qs to match scoop version.