Added fixes for errors