Fix some nitpicks