Standalone build fixes