Trying to fix build process