Minor cleanup and building beta 7.