Fixed more compiler errors