Some more error handling
DSL: Fix headwords normalizing