Fixed standalone build