Fixed a few errors