Some changes for bootstrap