[Bug Fix] Fix Compilation errors.