Fix minor alignment issues due to avenir next change.