Overlay: Changes as per PR-comments

* Use sizeof() rather then size constant where possible