 * Fix small bugs #948