some minor fixs