- MC-136249 config and a few small fixes and adjustments