Fixes on overlay