Fixed a few changes