Fixed a few silly things