Fixes to %op issues

• Fixes issue where "%op" was not properly removed during command compilation.