Fixed some minor issues with bootstrap.php