Some more corrections of things which might become issues