fix some other small issues