Fixed a few bugs in DSL impl. (reg. upgrades and Crucible)