Finished fixes for hard-coded registration and dual reg.