overflow fixes