Fixes for @randx

Change-Id: Ie9162d48bee9196f3f566b0234b921d4c22e0129