Fixing more undef values.