Fixed docs not building and some bootstrapping issues