Initial dist subtree commit
A couple a quick changes