again more overlay fixes