Try to fix build system