Try to fix make bugs