overlay: Fixes

Change-Id: Ib41c936ad218cc5fae5cfba5bc77ec7c7667435b