Merged in handy changes from v1.65