Fix broken commercial build