Fix potentially uninitialized variables