Fix calls to private methods and constructors