Fix small bugs.