Apply edits from #46