Fixed more compile issues