Small bug fixes all over the place for alpha-1.