Fixed Compiling Issues