A few service tweaks.