Merge some changes from uncrustify