Fixed a few issues in the Parse parameter handling

 Please enter the commit message for your changes. Lines starting