thread: fixup
util: fixup
fixup usercore
fixup servicecore
fixup servicecore