Minor modifications to fix the regular make files build