fix a few small issues