Fixing uninitialized variables