Minor Changes for Cloud and redirection

Minor Changes for Cloud and redirection