Some chenges/fixes