Some mior changes