improvements based on Mirebalais smoke tests