Updates since firepub