Fix OAdC length calculation; Add OAdC length trimming