Fixed a few more problems