0.64.1 fixes