Fixing some use of uninitialized value errors