Fixed a coupl of small things