Merged in couple fixes from v1.64