overlay errors fixed

Change-Id: Ic5f52747eff7adcabd84cd513344e670ea22525c