Fixed a few thing