Fixed Compilation errors from previous commit