More changes to prevent null values