Fix Surface,and more