Corrected more undefined index errors