Add initialization to some variables