Fix a couple missing initializations and whatnot.