Fix for if ("%{Tmp-Integer-0}" =~ /"%{Tmp-Integer-0}"/

and other minor issues