iOS-16: few more alignments