Some fixed

By jemi aymen