tweaks to help out staging env (obanyc-2056)