Some fixes to ensure variables are always initialized with newly integrated bootstrap