stash potential fixes from this morning