Replacing some assembly global vars