Extra fixes, which leaded to inconsistensies