 * Fix small bugs