Fixed a few Problems