Some fixies to build all
Initial dist subtree commit
merged