Port upstream fixes