Various Small changes