
        Fix build errors after rebase.

bc26b46