Updated bakefiles to match latest additions.