Fix up some undefineds