some small bugs, from last changes