Fixed a few more