lastest fixes