#267 follow-up fixes