Small fixes enhancing encapsulation