Fix CEF build and address review comments.