Minor tweak in building-blocks.
Minor tweak in patterns.