Hole overlay fixes