Fixed a few