Fixed little issues