Fix standalone functionality