Minor fixes to remove copy-paste