Bug 42: Fix standalone build