Bug Fixes: 1- https://savannah.cern.ch/bugs/index.php?64675 2- https://savannah.cern.ch/bugs/index.php?64360
