Improve support for alternate kernels, add beta version opt-in