More fixes to try and get patterns working properly