Build process fix