Fix some little things