Feature/multiple fixes