some tweaks for new services