Fix two pedantic errors
Create new makefiles after merge of 'settings'