Derp fix and better looking dumpvar

Change-Id: I5e7dde71f1dbab033ad01f84c9053c53019af110