more overflow fixes