Fix arm build, clean up Makefiles