Errors fix by broff