Fixed more compiler issues