fix overlay errors

Change-Id: Ic0f069d5d74d34cec4b4f763477e85b5dfd1ff8a