minor fixs
minor fixs