Minor misc tidies

i think they were changed to private because there was no indication that downstream projects used this