Revise a couple codes #3375