Fixed some minor issues
Merge pull request #480 from sriravic/curve_upstream_PR

Fixed some minor issues