more overlay xml fixes