Some surface corrections (making classes internal)