...fix some more mistakes