Fixing many issues in the workflow