Fixes for LBUF sizing for some old functions