Copy more public stuff