Attempting to fix uninitialized value warnings