Pattern fixes