Fixing merge issues

Merge overwrote the unit hierarchy and made it not inherit properly. All
fixed now.