More fixes. Buffer issues are back?