Minor changing and bug fixing

Minor change for messaging and bug fixed for watermark cmdlet