few errors fixes