Adjust makefiles, get lots of errors