You can't be too careful any more

Encapsulation tweaks