Fix arch naming convention, minor cleanups