Fixed a couple small issues