Fix another errors