fixes from staging regression test