Per-App-Expand bugfixes