fixes
fixes https://app.asana.com/0/5003181567170/5220301392058
multiple fixes