Fix Compile issues