Fix use of uninitialized variables