Minor Milestone 1 changes.