Fix some missing initializations