Move up the charset
Fix dependency placement
Duplicate line created in merge.