More ambuild fixes