fix a few little issues