Minor fixs

Minor fixs