Fixed some little problems