Previously omitted stackp, coll fixes