Lastest fixes