fix various places