Fixed more errors in gcc