Fix a few vars that can end up being used without initialization.