Fixed Compile issues