Fixing make calls