Minor changes before Submission
Fixes for Submission