Fix some uninitialized variables