unc-fi merged style fixes