An undefined index and a change in a setting

I hope there is still time for these two! :package: