Some tuning of Assumptions, Fix etc.