Consolidating some stuff back on v1.64