Proper MSR support for 15h