Some RE fixes in AAG_CloudWatcher module