More work to address stack overflows