Bug 34, Tweaks to force consistent development