Glacier: tweak memory tables

Change-Id: I07f1b6aff9d6fd6562f94d3fb300a0fb6ee21de2