Add more missing formatting