bootstrap small fixes