Fixed a few little issues