Basvi-Bug Fixes

flag size changes,optional missing(3520,3522)