Minor Fixes for Phase I

Minor Fixes for Phase I