Fix basic workflows