add stashed fixes