Fix some nitpickings.