Some more tweaks to simple workflow module