Fixed some errors due to new bootstrap file