also fixes...
 coverity#736210 Out-of-bounds access
 coverity#736211 Out-of-bounds access

Change-Id: Ie93150ec764abfc53881f4bad839e32e85fac65c