minor tweaks to address weird production errors