fix var initializations