Small stuff preparing for Beta 2 tag.