Design fixes

Addresses @jcdwyer1 priority issues.