Feature/bootstrap fixes