Fixing inconsistencies
Building