Debug overlay fixes