Initial dist subtree commit
small fixes