Small updates from upstream prezto