fix some more things pointed by @WouterJ