Change a few more options to be inline with Chromium kernels