fixes to staging pp