fix stuff w/ dlx, jewel, m7s

Change-Id: I2458696a2b7ebbf26f06cb4e99e1bf8057f6d233