fix overlay bugs