Updates to pattern library - fix stage issues