Minor updates from @ianvs