Fix another bugs