Some more overlay fixes