more fixes for new stashes api