Minor updates according to PR feedback