Fill in some missing values, guessed based on 23a