more encapsulation fixes