couple workflow tweaks