Fix return type issue, fix naked function name issue.