Fix first bugs