Added fixes for more errors