Fix issues with bootstrap