[HAO-Tracker-Primary] minor fixes in CustomFrameBuilder