Changes to support framework upgrade

Now new arrivals is broken?!