Misc /6 stuff

PM sent.