Fix some little stuff