Fixed some stuf