more pattern fixes