Fixed a variety of things