Misc changes for the new Mozilla Stackato