Fix some little problems.