fix some derps in nightly

Change-Id: If377a663443743e43568b99bd3a3f4bf53ee60fc