Some adds/fixs