Fixed a couples of things