Bootstrap and fixes