Fixing bootstrap
Updates