Clean up from T6 merge and fix up some kmsg errors