Tweak standalone functionality