Fixed a few smaller issues