(Bug 5073) Tweaks to tropo (foundation version)