more overlay fixes