Fixing underlining inconsistencies