Fixes in using overlay