cli: Changed buffer accesses sample fixup routine. Added TODO.