Fix more resource ordering issues and pathing for the expanded tar ball