Micro fixes - silence some notices about array index not being set.