errors fixes
errors fixes