Bug 926451: fix some setup bugs; r=Callek