Build warnings fix

fix for build warnings . Integrated review comments received on the previous PR