Small fixes after new warnings were added to makefiles.