Fixes Issues with Activity Flows