Chdoig/hotfixes