Fixed Compile Issues