Further patterns improvements.