Constraint solver in presence of wildcards and a few fixes.