Fix some little problems