Fixed issue with configure/make failures