Re-generated the Makefiles
Getting closer to building functional images again