stash! fixes before merge