Fixes for some of the Pliny --> App re-org