Fixed some little issues