some tweaks before deployment on staging