Fix standalone applications