Minor updates due to PR feedback