Some miscellaneous/minor updates as suggested by internal QA