AH-414 Fixed some double initializations