Revert "Minor Fixes"
Revert "Minor Fixes"

This reverts commit f6da36873eb6c7754fb49b4ba2d71d6b74b0e72d.

hosamshahin/OpenDSA,hosamshahin/OpenDSA,hosamshahin/OpenDSA,RJFreund/OpenDSA,RJFreund/OpenDSA,hosamshahin/OpenDSA,RJFreund/OpenDSA,RJFreund/OpenDSA,hosamshahin/OpenDSA,RJFreund/OpenDSA,hosamshahin/OpenDSA,RJFreund/OpenDSA,hosamshahin/OpenDSA,hosamshahin/OpenDSA,RJFreund/OpenDSA,RJFreund/OpenDSA,hosamshahin/OpenDSA