Some tweaks to take into account stuff in the SBT Email