More overlay fixes