Sync with latest Patrick E. sources