bootstrap fixes and more over.
Fixes #899 too