Fixed a couple problems