other errors fixes