Adding more fixes to Monitoring - AIRAVATA-1022