Fix some formatting bugs