more headless fixes (koush)

Change-Id: Ia0f9ac0c1e2bdbb2ed1ee7ea29c423210a03effd