More uncrustify fixes