Fixed some v6 stuff