Apply style fixes from #219