Fixing additional notice errors