More formatting bugs