errors fixes