Merge changes from Evan Mulawski to fix interop with fan control and lockups.