Changing to 0.6.3, part 2.

Breaking up into smaller pieces to avoid commit error.