some follow up fixes on changes made before