Solved several inconsistencies