Fix small changes