Fixed a few variables