Fix build config after code rebase