Changes required to get running on staging