Fix some format issues