overlay: fix ups

Change-Id: I0d7c665e2ad41c11e74248fa5d6d2514790b6f0c